@decaf-ts/core 0.7.11 → 0.7.13

package/lib/query/Statement.cjs

@@ -18,6 +18,10 @@ const logging_1 = require("@decaf-ts/logging");
 const persistence_1 = require("./../persistence/index.cjs");
 const errors_1 = require("./errors.cjs");
 const index_1 = require("./../utils/index.cjs");
+const Context_1 = require("./../persistence/Context.cjs");
+const types_1 = require("./types.cjs");
+const constants_1 = require("./constants.cjs");
+const index_2 = require("./../repository/index.cjs");
 /**
  * @description Base class for database query statements
  * @summary Provides a foundation for building and executing database queries
@@ -73,6 +77,21 @@ class Statement extends index_1.ContextualLoggedClass {
     constructor(adapter) {
         super();
         this.adapter = adapter;
+        [this.execute, this.paginate].forEach((m) => {
+            (0, db_decorators_1.prefixMethod)(this, m, async (...args) => {
+                let execArgs = args;
+                if ((!execArgs.length ||
+                    !(execArgs[execArgs.length - 1] instanceof Context_1.Context)) &&
+                    this.fromSelector) {
+                    const ctx = await this.adapter.context(persistence_1.PersistenceKeys.QUERY, {}, this.fromSelector);
+                    execArgs = [...execArgs, ctx];
+                }
+                const { ctx, ctxArgs } = persistence_1.Adapter.logCtx(execArgs, m.name);
+                if (!ctx.get("allowRawStatements") && !this.prepared)
+                    await this.prepare(ctx);
+                return ctxArgs;
+            }, m.name);
+        });
     }
     get log() {
         return this.adapter.log.for(Statement);
@@ -127,14 +146,7 @@ class Statement extends index_1.ContextualLoggedClass {
         return this;
     }
     async execute(...args) {
-        let execArgs = args;
-        if ((!execArgs.length ||
-            !(execArgs[execArgs.length - 1] instanceof db_decorators_1.Context)) &&
-            this.fromSelector) {
-            const ctx = await this.adapter.context(db_decorators_1.OperationKeys.READ, {}, this.fromSelector);
-            execArgs = [...execArgs, ctx];
-        }
-        const { ctx } = persistence_1.Adapter.logCtx(execArgs, this.toString());
+        const ctx = args.pop(); // handled by prefix
         try {
             const query = this.build();
             return (await this.raw(query, ctx));
@@ -157,6 +169,248 @@ class Statement extends index_1.ContextualLoggedClass {
             return results.map(processor);
         return processor(results);
     }
+    prepareCondition(condition, ctx) {
+        // @ts-expect-error accessing protected properties
+        // eslint-disable-next-line prefer-const
+        let { attr1, operator, comparison } = condition;
+        const result = {};
+        switch (operator) {
+            case constants_1.GroupOperator.AND:
+            case constants_1.GroupOperator.OR: {
+                let side1 = attr1, side2 = comparison;
+                if (typeof attr1 !== "string") {
+                    const condition1 = this.prepareCondition(attr1, ctx);
+                    side1 = condition1.method;
+                    result.args = [...(result.args || []), ...(condition1.args || [])];
+                }
+                if (comparison instanceof Condition_1.Condition) {
+                    const condition2 = this.prepareCondition(comparison, ctx);
+                    side2 = condition2.method;
+                    result.args = [...(result.args || []), ...(condition2.args || [])];
+                }
+                result.method = `${side1} ${operator.toLowerCase()} ${side2}`;
+                break;
+            }
+            case constants_1.Operator.EQUAL:
+                result.method = attr1;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case constants_1.Operator.DIFFERENT:
+                result.method = `${attr1} diff`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case constants_1.Operator.REGEXP:
+                result.method = `${attr1} matches`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case constants_1.Operator.BIGGER:
+                result.method = `${attr1} bigger`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case constants_1.Operator.BIGGER_EQ:
+                result.method = `${attr1} bigger than equal`;
+                break;
+            case constants_1.Operator.SMALLER:
+                result.method = `${attr1} less`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case constants_1.Operator.SMALLER_EQ:
+                result.method = `${attr1} less than equal`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            case constants_1.Operator.IN:
+                result.method = `${attr1} in`;
+                result.args = [...(result.args || []), comparison];
+                break;
+            default:
+                throw new errors_1.QueryError(`Unsupported operator ${operator}`);
+        }
+        return result;
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    squash(ctx) {
+        if (this.selectSelector && this.selectSelector.length)
+            return undefined;
+        if (this.groupBySelector)
+            return undefined;
+        if (this.countSelector)
+            return undefined;
+        if (this.maxSelector)
+            return undefined;
+        if (this.minSelector)
+            return undefined;
+        let attrFromWhere;
+        if (this.whereCondition) {
+            if (this.whereCondition["comparison"] instanceof Condition_1.Condition)
+                return undefined;
+            attrFromWhere = this.whereCondition["attr1"];
+        }
+        const order = this.orderBySelector
+            ? this.orderBySelector
+            : attrFromWhere
+                ? [attrFromWhere, index_2.OrderDirection.DSC]
+                : [decorator_validation_1.Model.pk(this.fromSelector), index_2.OrderDirection.DSC];
+        const [attrFromOrderBy, sort] = order;
+        const params = {
+            direction: sort,
+        };
+        if (this.limitSelector)
+            params.limit = this.limitSelector;
+        if (this.offsetSelector)
+            params.offset = this.offsetSelector;
+        const squashed = {
+            // listBy
+            class: this.fromSelector,
+            method: constants_1.PreparedStatementKeys.LIST_BY,
+            args: [attrFromOrderBy],
+            params: params,
+        };
+        if (attrFromWhere) {
+            // findBy
+            squashed.method = constants_1.PreparedStatementKeys.FIND_BY;
+            squashed.args = [
+                attrFromWhere,
+                this.whereCondition["comparison"],
+            ];
+            squashed.params = params;
+        }
+        return squashed;
+        //
+        //
+        //
+        // let attrs = rawStatement.method.split(
+        //   new RegExp(
+        //     `(${[QueryClause.FIND_BY, QueryClause.SELECT, QueryClause.ORDER_BY, QueryClause.GROUP_BY, QueryClause.AND, QueryClause.OR].join("|")})`,
+        //     "i"
+        //   )
+        // );
+        //
+        // attrs = attrs
+        //   .map((s) => s.trim())
+        //   .filter(Boolean)
+        //   .filter(
+        //     (s) =>
+        //       ![
+        //         QueryClause.FIND_BY,
+        //         QueryClause.SELECT,
+        //         QueryClause.ORDER_BY,
+        //         QueryClause.GROUP_BY,
+        //         toPascalCase(OrderDirection.ASC),
+        //         toPascalCase(OrderDirection.DSC),
+        //       ].find((c) => s.includes(c))
+        //   );
+        //
+        // const fullOrderBy = rawStatement.method.split(QueryClause.ORDER_BY);
+        // let orderBy: any;
+        // if (fullOrderBy.length) {
+        //   orderBy = fullOrderBy[1]
+        //     .split(
+        //       new RegExp(
+        //         `${[toPascalCase(OrderDirection.ASC), toPascalCase(OrderDirection.DSC), QueryClause.GROUP_BY + ".*", QueryClause.THEN_BY].join("|")}`,
+        //         "i"
+        //       )
+        //     )
+        //     .map((s) => s.trim())
+        //     .filter(Boolean);
+        //   orderBy = [
+        //     orderBy[0] as any,
+        //     fullOrderBy[1].includes(toPascalCase(OrderDirection.ASC))
+        //       ? OrderDirection.ASC
+        //       : OrderDirection.DSC,
+        //   ];
+        // }
+        //
+        // const canBeSquashed = (!attrs.length
+        //   || (attrs.length === 1 && attrs[0] === orderBy[0]
+        //
+        // if (attrs.length === 1 && attrs[0] === orderBy[0]) {
+        //   // there's an order by
+        //   const attr = attrs[0];
+        //   if (attrFromWhere && attrFromWhere !== attr) {
+        //     return rawStatement;
+        //   }
+        //   return Object.assign({}, rawStatement, {
+        //     method: PreparedStatementKeys.LIST_BY,
+        //     args: [toCamelCase(attr), orderBy[1]],
+        //     // args: [toCamelCase(attr), orderBy[1], this.size],
+        //   });
+        // } else {
+        //   // there's no orderBy
+        //   return Object.assign({}, rawStatement, {
+        //     method: rawStatement.method.replace(QueryClause.FIND_BY, PreparedStatementKeys.LIST_BY),
+        //     args: [...rawStatement.args],
+        //     // args: [...rawStatement.args, this.size],
+        //   });
+        // }
+    }
+    async prepare(ctx) {
+        ctx =
+            ctx ||
+                (await this.adapter.context(persistence_1.PersistenceKeys.QUERY, {}, this.fromSelector));
+        if (ctx.get("squashSimpleQueries")) {
+            const squashed = this.squash(ctx);
+            if (squashed) {
+                this.prepared = squashed;
+                return this;
+            }
+        }
+        const args = [];
+        const params = {};
+        const prepared = {
+            class: this.fromSelector,
+            args,
+            params,
+        };
+        const method = [types_1.QueryClause.FIND_BY];
+        if (this.whereCondition) {
+            const parsed = this.prepareCondition(this.whereCondition, ctx);
+            method.push(parsed.method);
+            if (parsed.args && parsed.args.length)
+                args.push(...parsed.args);
+        }
+        if (this.selectSelector)
+            method.push(types_1.QueryClause.SELECT, this.selectSelector.join(` ${types_1.QueryClause.AND.toLowerCase()} `));
+        if (this.orderBySelector)
+            method.push(types_1.QueryClause.ORDER_BY, ...this.orderBySelector);
+        if (this.groupBySelector)
+            method.push(types_1.QueryClause.GROUP_BY, this.groupBySelector);
+        if (this.limitSelector)
+            params.limit = this.limitSelector;
+        if (this.offsetSelector) {
+            params.skip = this.offsetSelector;
+        }
+        prepared.method = (0, logging_1.toCamelCase)(method.join(" "));
+        prepared.params = params;
+        this.prepared = prepared;
+        if (!ctx.get("squashSimpleQueries") ||
+            (this.selectSelector && this.selectSelector.length) ||
+            this.groupBySelector ||
+            this.countSelector ||
+            this.maxSelector ||
+            this.minSelector) {
+            return this;
+        }
+        this.prepared = prepared;
+        return this;
+    }
+    /**
+     * @description Creates a paginator for the query
+     * @summary Builds the query and wraps it in a RamPaginator to enable pagination of results.
+     * This allows retrieving large result sets in smaller chunks.
+     * @param {number} size - The page size (number of results per page)
+     * @return {Promise<Paginator<M, R, RawRamQuery<M>>>} A promise that resolves to a paginator for the query
+     */
+    async paginate(size, ...args) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        const ctx = args.pop(); // handled by prefix. kept for example for overrides
+        try {
+            const query = this.build();
+            return this.adapter.Paginator(query, size, this.fromSelector);
+        }
+        catch (e) {
+            throw new errors_1.QueryError(e);
+        }
+    }
     toString() {
         return `${this.adapter.flavour} statement`;
     }

package/lib/query/Statement.d.ts

@@ -2,13 +2,14 @@ import { Model } from "@decaf-ts/decorator-validation";
 import type { Executor, RawExecutor } from "../interfaces";
 import type { FromSelector, GroupBySelector, OrderBySelector, SelectSelector } from "./selectors";
 import { Condition } from "./Condition";
-import type { CountOption, DistinctOption, LimitOption, MaxOption, MinOption, OffsetOption, OrderAndGroupOption, SelectOption, WhereOption } from "./options";
+import type { CountOption, DistinctOption, LimitOption, MaxOption, MinOption, OffsetOption, OrderAndGroupOption, PreparableStatementExecutor, SelectOption, StatementExecutor, WhereOption } from "./options";
 import { Paginatable } from "../interfaces/Paginatable";
 import { Paginator } from "./Paginator";
 import { Adapter, type ContextOf } from "../persistence";
 import { Logger } from "@decaf-ts/logging";
 import { Constructor } from "@decaf-ts/decoration";
 import { type ContextualArgs, ContextualLoggedClass, type MaybeContextualArg } from "../utils/index";
+import { PreparedStatement } from "./types";
 /**
  * @description Base class for database query statements
  * @summary Provides a foundation for building and executing database queries
@@ -73,6 +74,7 @@ export declare abstract class Statement<M extends Model, A extends Adapter<any,
     protected groupBySelector?: GroupBySelector<M>;
     protected limitSelector?: number;
     protected offsetSelector?: number;
+    protected prepared?: PreparedStatement<M>;
     protected constructor(adapter: Adapter<any, any, Q, any>);
     protected get log(): Logger;
     select<S extends readonly SelectSelector<M>[]>(): SelectOption<M, M[]>;
@@ -83,14 +85,24 @@ export declare abstract class Statement<M extends Model, A extends Adapter<any,
     count<S extends SelectSelector<M>>(selector?: S): CountOption<M, number>;
     from(selector: FromSelector<M>): WhereOption<M, R>;
     where(condition: Condition<M>): OrderAndGroupOption<M, R>;
-    orderBy(selector: OrderBySelector<M>): LimitOption<M, R> & OffsetOption<R>;
+    orderBy(selector: OrderBySelector<M>): LimitOption<M, R> & OffsetOption<M, R>;
     groupBy(selector: GroupBySelector<M>): LimitOption<M, R>;
-    limit(value: number): OffsetOption<R>;
-    offset(value: number): Executor<R>;
+    limit(value: number): OffsetOption<M, R>;
+    offset(value: number): PreparableStatementExecutor<M, R>;
     execute(...args: MaybeContextualArg<ContextOf<A>>): Promise<R>;
     raw<R>(rawInput: Q, ...args: ContextualArgs<ContextOf<A>>): Promise<R>;
+    protected prepareCondition(condition: Condition<any>, ctx: ContextOf<A>): PreparedStatement<any>;
+    protected squash(ctx: ContextOf<A>): PreparedStatement<any> | undefined;
+    prepare(ctx?: ContextOf<A>): Promise<StatementExecutor<M, R>>;
     protected abstract build(): Q;
     protected abstract parseCondition(condition: Condition<M>, ...args: any[]): Q;
-    abstract paginate(size: number, ...args: MaybeContextualArg<ContextOf<A>>): Promise<Paginator<M, R, Q>>;
+    /**
+     * @description Creates a paginator for the query
+     * @summary Builds the query and wraps it in a RamPaginator to enable pagination of results.
+     * This allows retrieving large result sets in smaller chunks.
+     * @param {number} size - The page size (number of results per page)
+     * @return {Promise<Paginator<M, R, RawRamQuery<M>>>} A promise that resolves to a paginator for the query
+     */
+    paginate(size: number, ...args: MaybeContextualArg<ContextOf<A>>): Promise<Paginator<M, R, Q>>;
     toString(): string;
 }

package/lib/query/Statement.js.map

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

package/lib/query/constants.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GroupOperator = exports.Operator = void 0;
+exports.PreparedStatementKeys = exports.GroupOperator = exports.Operator = void 0;
+const types_1 = require("./types.cjs");
 /**
  * @description Comparison operators for query conditions
  * @summary Enum defining the available operators for comparing values in database queries
@@ -45,4 +46,11 @@ var GroupOperator;
     /** Logical OR operator - at least one condition must be true */
     GroupOperator["OR"] = "OR";
 })(GroupOperator || (exports.GroupOperator = GroupOperator = {}));
+var PreparedStatementKeys;
+(function (PreparedStatementKeys) {
+    PreparedStatementKeys["LIST_BY"] = "listBy";
+    PreparedStatementKeys["FIND_BY"] = "findBy";
+    PreparedStatementKeys["FIND_ONE_BY"] = "findOneBy";
+    PreparedStatementKeys["PAGE_BY"] = "paginateBy";
+})(PreparedStatementKeys || (exports.PreparedStatementKeys = PreparedStatementKeys = {}));
 //# sourceMappingURL=constants.js.map

package/lib/query/constants.d.ts

@@ -38,3 +38,9 @@ export declare enum GroupOperator {
     /** Logical OR operator - at least one condition must be true */
     OR = "OR"
 }
+export declare enum PreparedStatementKeys {
+    LIST_BY = "listBy",
+    FIND_BY = "findBy",
+    FIND_ONE_BY = "findOneBy",
+    PAGE_BY = "paginateBy"
+}

package/lib/query/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/query/constants.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACH,IAAY,QAqBX;AArBD,WAAY,QAAQ;IAClB,2BAA2B;IAC3B,2BAAe,CAAA;IACf,gCAAgC;IAChC,mCAAuB,CAAA;IACvB,kCAAkC;IAClC,6BAAiB,CAAA;IACjB,4CAA4C;IAC5C,mCAAuB,CAAA;IACvB,+BAA+B;IAC/B,+BAAmB,CAAA;IACnB,yCAAyC;IACzC,qCAAyB,CAAA;IACzB,uBAAuB;IACvB,8BAA8B;IAC9B,uBAAW,CAAA;IACX,8BAA8B;IAC9B,qBAAS,CAAA;IACT,aAAa;IACb,kCAAkC;IAClC,6BAAiB,CAAA;AACnB,CAAC,EArBW,QAAQ,wBAAR,QAAQ,QAqBnB;AAED;;;;;;GAMG;AACH,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,yDAAyD;IACzD,4BAAW,CAAA;IACX,gEAAgE;IAChE,0BAAS,CAAA;AACX,CAAC,EALW,aAAa,6BAAb,aAAa,QAKxB"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/query/constants.ts"],"names":[],"mappings":";;;AAAA,uCAAsC;AAEtC;;;;;;GAMG;AACH,IAAY,QAqBX;AArBD,WAAY,QAAQ;IAClB,2BAA2B;IAC3B,2BAAe,CAAA;IACf,gCAAgC;IAChC,mCAAuB,CAAA;IACvB,kCAAkC;IAClC,6BAAiB,CAAA;IACjB,4CAA4C;IAC5C,mCAAuB,CAAA;IACvB,+BAA+B;IAC/B,+BAAmB,CAAA;IACnB,yCAAyC;IACzC,qCAAyB,CAAA;IACzB,uBAAuB;IACvB,8BAA8B;IAC9B,uBAAW,CAAA;IACX,8BAA8B;IAC9B,qBAAS,CAAA;IACT,aAAa;IACb,kCAAkC;IAClC,6BAAiB,CAAA;AACnB,CAAC,EArBW,QAAQ,wBAAR,QAAQ,QAqBnB;AAED;;;;;;GAMG;AACH,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,yDAAyD;IACzD,4BAAW,CAAA;IACX,gEAAgE;IAChE,0BAAS,CAAA;AACX,CAAC,EALW,aAAa,6BAAb,aAAa,QAKxB;AAED,IAAY,qBAKX;AALD,WAAY,qBAAqB;IAC/B,2CAAkB,CAAA;IAClB,2CAA6B,CAAA;IAC7B,kDAAyB,CAAA;IACzB,+CAAsB,CAAA;AACxB,CAAC,EALW,qBAAqB,qCAArB,qBAAqB,QAKhC"}

package/lib/query/decorators.cjs

@@ -68,7 +68,17 @@ function query(options = {}) {
                     });
                 };
             }
-            return (0, decoration_1.apply)((0, decoration_1.methodMetadata)(decoration_1.Metadata.key(constants_1.PersistenceKeys.QUERY, prop), options), prepared(), innerQuery(options))(obj, prop, descriptor);
+            const fields = MethodQueryBuilder_1.MethodQueryBuilder.getFieldsFromMethodName(prop);
+            // const paramNames = descriptor.value
+            //   .toString()
+            //   .match(/\(([^)]*)\)/)?.[1]
+            //   .split(",")
+            //   .map((x) => x.trim())
+            //   .filter(Boolean);
+            return (0, decoration_1.apply)((0, decoration_1.methodMetadata)(decoration_1.Metadata.key(constants_1.PersistenceKeys.QUERY, prop), {
+                ...options,
+                fields,
+            }), prepared(), innerQuery(options))(obj, prop, descriptor);
         };
     }
     return decoration_1.Decoration.for(constants_1.PersistenceKeys.QUERY)

package/lib/query/decorators.js.map

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

package/lib/query/options.d.ts

@@ -4,6 +4,11 @@ import { Model } from "@decaf-ts/decorator-validation";
 import { Condition } from "./Condition";
 import { Paginatable } from "../interfaces/Paginatable";
 import { Constructor } from "@decaf-ts/decoration";
+export interface StatementExecutor<M extends Model, R> extends Executor<R>, Paginatable<M, R, any> {
+}
+export interface PreparableStatementExecutor<M extends Model, R> extends StatementExecutor<M, R> {
+    prepare(...args: any[]): Promise<StatementExecutor<M, R>>;
+}
 /**
  * @summary GroupBy Option interface
  * @description Exposes the GROUP BY method and remaining options
@@ -12,7 +17,7 @@ import { Constructor } from "@decaf-ts/decoration";
  * @memberOf module:core
  */
 export interface GroupByOption<M extends Model, R> extends Executor<R> {
-    groupBy(selector: GroupBySelector<M>): Executor<R>;
+    groupBy(selector: GroupBySelector<M>): PreparableStatementExecutor<M, R>;
 }
 /**
  * @summary Offset Option interface
@@ -21,8 +26,8 @@ export interface GroupByOption<M extends Model, R> extends Executor<R> {
  * @interface GroupByOption
  * @memberOf module:core
  */
-export interface OffsetOption<R> extends Executor<R> {
-    offset(selector: OffsetSelector): Executor<R>;
+export interface OffsetOption<M extends Model, R> extends PreparableStatementExecutor<M, R> {
+    offset(selector: OffsetSelector): PreparableStatementExecutor<M, R>;
 }
 /**
  * @summary Limit Option interface
@@ -31,8 +36,8 @@ export interface OffsetOption<R> extends Executor<R> {
  * @interface LimitOption
  * @memberOf module:core
  */
-export interface LimitOption<M extends Model, R> extends Executor<R>, Paginatable<M, R, any> {
-    limit(selector: LimitSelector): OffsetOption<R>;
+export interface LimitOption<M extends Model, R> extends PreparableStatementExecutor<M, R> {
+    limit(selector: LimitSelector): OffsetOption<M, R>;
 }
 /**
  * @summary OrderBy Option interface
@@ -41,8 +46,8 @@ export interface LimitOption<M extends Model, R> extends Executor<R>, Paginatabl
  * @interface OrderByOption
  * @memberOf module:core
  */
-export interface OrderByOption<M extends Model, R> extends Executor<R>, Paginatable<M, R, any> {
-    orderBy(selector: OrderBySelector<M>): LimitOption<M, R> & OffsetOption<R>;
+export interface OrderByOption<M extends Model, R> extends PreparableStatementExecutor<M, R> {
+    orderBy(selector: OrderBySelector<M>): LimitOption<M, R> & OffsetOption<M, R>;
 }
 /**
  * @summary OrderBy Option interface
@@ -51,7 +56,7 @@ export interface OrderByOption<M extends Model, R> extends Executor<R>, Paginata
  * @interface ThenByOption
  * @memberOf module:core
  */
-export interface ThenByOption<M extends Model, R> extends LimitOption<M, R>, OffsetOption<R>, Executor<R>, Paginatable<M, R, any> {
+export interface ThenByOption<M extends Model, R> extends LimitOption<M, R>, OffsetOption<M, R>, PreparableStatementExecutor<M, R> {
     thenBy(selector: OrderBySelector<M>): ThenByOption<M, R>;
 }
 /**
@@ -64,7 +69,7 @@ export interface ThenByOption<M extends Model, R> extends LimitOption<M, R>, Off
  * @extends OffsetOption
  * @memberOf module:core
  */
-export interface OrderAndGroupOption<M extends Model, R> extends OrderByOption<M, R>, Executor<R>, GroupByOption<M, R>, LimitOption<M, R>, OffsetOption<R> {
+export interface OrderAndGroupOption<M extends Model, R> extends OrderByOption<M, R>, PreparableStatementExecutor<M, R>, GroupByOption<M, R>, LimitOption<M, R>, OffsetOption<M, R> {
 }
 /**
  * @summary Where Option interface

package/lib/query/types.d.ts

@@ -1,5 +1,8 @@
 import { Condition } from "./Condition";
 import { OrderBySelector } from "./selectors";
+import { Model } from "@decaf-ts/decorator-validation";
+import { Constructor } from "@decaf-ts/decoration";
+import { OrderDirection } from "../repository/constants";
 /**
  * @description
  * Options for configuring query building behavior.
@@ -17,6 +20,22 @@ export type QueryOptions = {
     allowOrderBy?: boolean;
     throws?: boolean;
 };
+export type OrderLimitOffsetExtract = {
+    orderBy?: OrderBySelector<any>[];
+    limit?: number;
+    offset?: number;
+};
+export type DirectionLimitOffset = {
+    direction?: OrderDirection;
+    limit?: number;
+    offset?: number;
+};
+export type PreparedStatement<M extends Model> = {
+    class: Constructor<M>;
+    method: string;
+    args: any[];
+    params: DirectionLimitOffset;
+};
 /**
  * @description
  * Structured query object representing parsed query clauses.
@@ -34,7 +53,7 @@ export type QueryOptions = {
 export interface QueryAssist {
     action: "find";
     select: undefined | string[];
-    where: Condition<any>;
+    where?: Condition<any>;
     groupBy?: string[];
     orderBy?: OrderBySelector<any>[];
     limit: number | undefined;

package/lib/query/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/query/types.ts"],"names":[],"mappings":";;;AA6CA;;;;;;;;;;GAUG;AACH,IAAY,WASX;AATD,WAAY,WAAW;IACrB,iCAAkB,CAAA;IAClB,gCAAiB,CAAA;IACjB,0BAAW,CAAA;IACX,wBAAS,CAAA;IACT,mCAAoB,CAAA;IACpB,mCAAoB,CAAA;IACpB,4BAAa,CAAA;IACb,iCAAkB,CAAA;AACpB,CAAC,EATW,WAAW,2BAAX,WAAW,QAStB"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/query/types.ts"],"names":[],"mappings":";;;AAmEA;;;;;;;;;;GAUG;AACH,IAAY,WASX;AATD,WAAY,WAAW;IACrB,iCAAkB,CAAA;IAClB,gCAAiB,CAAA;IACjB,0BAAW,CAAA;IACX,wBAAS,CAAA;IACT,mCAAoB,CAAA;IACpB,mCAAoB,CAAA;IACpB,4BAAa,CAAA;IACb,iCAAkB,CAAA;AACpB,CAAC,EATW,WAAW,2BAAX,WAAW,QAStB"}

package/lib/ram/RamAdapter.cjs

@@ -9,6 +9,7 @@ const db_decorators_1 = require("@decaf-ts/db-decorators");
 const handlers_1 = require("./handlers.cjs");
 const constants_1 = require("./constants.cjs");
 const decoration_1 = require("@decaf-ts/decoration");
+const RamPaginator_1 = require("./RamPaginator.cjs");
 /**
  * @description In-memory adapter for data persistence
  * @summary The RamAdapter provides an in-memory implementation of the persistence layer.
@@ -55,7 +56,6 @@ const decoration_1 = require("@decaf-ts/decoration");
 class RamAdapter extends persistence_1.Adapter {
     constructor(conf = {}, alias) {
         super(conf, constants_1.RamFlavour, alias);
-        this.Context = db_decorators_1.Context;
         this.indexes = {};
         this.lock = new transactional_decorators_1.Lock();
     }
@@ -403,6 +403,9 @@ class RamAdapter extends persistence_1.Adapter {
     Statement() {
         return new RamStatement_1.RamStatement(this);
     }
+    Paginator(query, size, clazz) {
+        return new RamPaginator_1.RamPaginator(this, query, size, clazz);
+    }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     for(config, ...args) {
         if (!this.proxies)

package/lib/ram/RamAdapter.d.ts

@@ -5,7 +5,8 @@ import { Dispatch } from "../persistence/Dispatch";
 import { Adapter } from "../persistence";
 import { Model } from "@decaf-ts/decorator-validation";
 import { BaseError, OperationKeys, PrimaryKeyType } from "@decaf-ts/db-decorators";
-import { Constructor } from "@decaf-ts/decoration";
+import type { Constructor } from "@decaf-ts/decoration";
+import { RamPaginator } from "./RamPaginator";
 /**
  * @description In-memory adapter for data persistence
  * @summary The RamAdapter provides an in-memory implementation of the persistence layer.
@@ -71,7 +72,6 @@ export declare class RamAdapter extends Adapter<RamConfig, RamStorage, RawRamQue
      */
     flags<M extends Model<boolean>>(operation: OperationKeys, model: Constructor<M>, flags: Partial<RamFlags>): Promise<RamFlags>;
     protected Dispatch(): Dispatch<RamAdapter>;
-    Context: Constructor<RamContext>;
     private indexes;
     private lock;
     /**
@@ -296,6 +296,7 @@ export declare class RamAdapter extends Adapter<RamConfig, RamStorage, RawRamQue
      * @return {RamStatement<M, any>} A new statement builder instance
      */
     Statement<M extends Model<boolean>>(): RamStatement<M, any, Adapter<any, any, RawRamQuery<M>, RamContext>>;
+    Paginator<M extends Model<boolean>>(query: RawRamQuery, size: number, clazz: Constructor<M>): RamPaginator<M, any>;
     for(config: Partial<RamConfig>, ...args: any[]): typeof this;
     /**
      * @description Sets up RAM-specific decorations for model properties