@decaf-ts/core 0.8.26 → 0.8.28

package/lib/esm/index.d.ts

@@ -21,7 +21,7 @@ export * from "./persistence";
  * @const VERSION
  * @memberOf module:core
  */
-export declare const VERSION = "0.8.25";
+export declare const VERSION = "0.8.27";
 /**
  * @description Stores the current package version
  * @summary A constant representing the version of the core package

package/lib/esm/index.js

@@ -31,7 +31,7 @@ export * from "./persistence/index.js";
  * @const VERSION
  * @memberOf module:core
  */
-export const VERSION = "0.8.25";
+export const VERSION = "0.8.27";
 /**
  * @description Stores the current package version
  * @summary A constant representing the version of the core package

package/lib/esm/query/MethodQueryBuilder.d.ts

@@ -1,5 +1,9 @@
-import { QueryAssist } from "./types";
+import { QueryAction, QueryAssist } from "./types";
 import { LoggedClass, Logger } from "@decaf-ts/logging";
+export type QueryActionPrefix = {
+    action: QueryAction;
+    prefix: string;
+};
 /**
  * @description
  * Utility class to build query objects from repository method names.
@@ -56,6 +60,19 @@ import { LoggedClass, Logger } from "@decaf-ts/logging";
 export declare class MethodQueryBuilder extends LoggedClass {
     private static _logger;
     protected static get log(): Logger;
+    /**
+     * @description
+     * Map of query prefixes to their corresponding actions.
+     */
+    private static readonly prefixMap;
+    /**
+     * @description
+     * Determines the action and prefix length from a method name.
+     *
+     * @param methodName {string} - The repository method name.
+     * @return {QueryActionPrefix} | undefined} The action and prefix if found.
+     */
+    private static getActionFromMethodName;
     /**
      * @description
      * Builds a `QueryAssist` object by parsing a repository method name and values.
@@ -73,13 +90,23 @@ export declare class MethodQueryBuilder extends LoggedClass {
     static build(methodName: string, ...values: any[]): QueryAssist;
     /**
      * @description
-     * Extracts the core part of the method name after `findBy` and before any special clauses.
+     * Extracts the aggregation selector field from method names like countByAge, sumByPrice.
+     *
+     * @param methodName {string} - The method name.
+     * @param prefix {string} - The prefix to remove.
+     * @return {string | undefined} The selector field name.
+     */
+    private static extractAggregationSelector;
+    /**
+     * @description
+     * Extracts the core part of the method name after the prefix and before any special clauses.
      *
      * @summary
      * Removes prefixes and detects delimiters (`Then`, `OrderBy`, `GroupBy`, `Limit`, `Offset`)
      * to isolate the main conditional part of the query.
      *
      * @param methodName {string} - The method name to parse.
+     * @param prefix {string} - The prefix to remove (e.g., "findBy", "countBy").
      *
      * @return {string} The extracted core string used for building conditions.
      */
@@ -148,8 +175,9 @@ export declare class MethodQueryBuilder extends LoggedClass {
      * Determines the number of condition arguments, then checks the remaining arguments
      * to resolve sorting, limiting, and pagination.
      *
-     * @param methodName {string} - The extracted core string from the method name.
+     * @param methodName {string} - The method name.
      * @param values {any[]} - The values corresponding to method arguments, including conditions and extras.
+     * @param core {string} - The pre-extracted core string.
      *
      * @return {OrderLimitOffsetExtract} An object containing orderBy, limit, and offset values if present.
      */

package/lib/esm/query/MethodQueryBuilder.js

@@ -64,6 +64,36 @@ export class MethodQueryBuilder extends LoggedClass {
             this._logger = Logging.for(MethodQueryBuilder.name);
         return this._logger;
     }
+    /**
+     * @description
+     * Map of query prefixes to their corresponding actions.
+     */
+    static { this.prefixMap = {
+        [QueryClause.FIND_BY]: "find",
+        [QueryClause.PAGE_BY]: "page",
+        [QueryClause.COUNT_BY]: "count",
+        [QueryClause.SUM_BY]: "sum",
+        [QueryClause.AVG_BY]: "avg",
+        [QueryClause.MIN_BY]: "min",
+        [QueryClause.MAX_BY]: "max",
+        [QueryClause.DISTINCT_BY]: "distinct",
+        [QueryClause.GROUP_BY_PREFIX]: "group",
+    }; }
+    /**
+     * @description
+     * Determines the action and prefix length from a method name.
+     *
+     * @param methodName {string} - The repository method name.
+     * @return {QueryActionPrefix} | undefined} The action and prefix if found.
+     */
+    static getActionFromMethodName(methodName) {
+        for (const [prefix, action] of Object.entries(this.prefixMap)) {
+            if (methodName.startsWith(prefix)) {
+                return { action, prefix };
+            }
+        }
+        return undefined;
+    }
     /**
      * @description
      * Builds a `QueryAssist` object by parsing a repository method name and values.
@@ -79,18 +109,25 @@ export class MethodQueryBuilder extends LoggedClass {
      * @return {QueryAssist} A structured query object representing the parsed query.
      */
     static build(methodName, ...values) {
-        if (!methodName.startsWith(QueryClause.FIND_BY)) {
+        const actionInfo = this.getActionFromMethodName(methodName);
+        if (!actionInfo) {
             throw new Error(`Unsupported method ${methodName}`);
         }
-        const core = this.extractCore(methodName);
+        const { action, prefix } = actionInfo;
+        // For aggregation methods (count, sum, avg, min, max, distinct), extract the selector field
+        let selector;
+        if (["count", "sum", "avg", "min", "max", "distinct", "group"].includes(action)) {
+            selector = this.extractAggregationSelector(methodName, prefix);
+        }
+        const core = this.extractCore(methodName, prefix);
         const select = this.extractSelect(methodName);
         const groupBy = this.extractGroupBy(methodName);
-        // const orderBy = this.extractOrderBy(methodName);
         const where = this.buildWhere(core, values);
-        const { orderBy, limit, offset } = this.extractOrderLimitOffset(methodName, values);
+        const { orderBy, limit, offset } = this.extractOrderLimitOffset(methodName, values, core);
         return {
-            action: "find",
-            select: select,
+            action,
+            select,
+            selector,
             where,
             groupBy,
             orderBy,
@@ -100,27 +137,84 @@ export class MethodQueryBuilder extends LoggedClass {
     }
     /**
      * @description
-     * Extracts the core part of the method name after `findBy` and before any special clauses.
+     * Extracts the aggregation selector field from method names like countByAge, sumByPrice.
+     *
+     * @param methodName {string} - The method name.
+     * @param prefix {string} - The prefix to remove.
+     * @return {string | undefined} The selector field name.
+     */
+    static extractAggregationSelector(methodName, prefix) {
+        const afterPrefix = methodName.substring(prefix.length);
+        // Find where the selector ends (at next clause keyword, operator, or end)
+        // Include ThenBy for groupBy prefix
+        const regex = /(And|Or|GroupBy|OrderBy|Select|Limit|Offset|ThenBy)/;
+        const match = afterPrefix.match(regex);
+        const selectorPart = match
+            ? afterPrefix.substring(0, match.index)
+            : afterPrefix;
+        return selectorPart ? lowerFirst(selectorPart) : undefined;
+    }
+    /**
+     * @description
+     * Extracts the core part of the method name after the prefix and before any special clauses.
      *
      * @summary
      * Removes prefixes and detects delimiters (`Then`, `OrderBy`, `GroupBy`, `Limit`, `Offset`)
      * to isolate the main conditional part of the query.
      *
      * @param methodName {string} - The method name to parse.
+     * @param prefix {string} - The prefix to remove (e.g., "findBy", "countBy").
      *
      * @return {string} The extracted core string used for building conditions.
      */
-    static extractCore(methodName) {
-        const afterFindBy = methodName.substring(QueryClause.FIND_BY.length);
-        const regex = /(Then[A-Z]|OrderBy|GroupBy|Limit|Offset)/;
-        const match = afterFindBy.match(regex);
-        return match ? afterFindBy.substring(0, match.index) : afterFindBy;
+    static extractCore(methodName, prefix = QueryClause.FIND_BY) {
+        const afterPrefix = methodName.substring(prefix.length);
+        // For aggregation methods (not findBy or pageBy), we need to skip the selector field
+        const isAggregationPrefix = prefix !== QueryClause.FIND_BY && prefix !== QueryClause.PAGE_BY;
+        if (isAggregationPrefix) {
+            // For aggregation methods, we need to find where actual conditions start
+            // Conditions are indicated by And|Or AFTER the selector field
+            // For "countByAgeAndNameEquals", conditions start at "AndNameEquals"
+            // For "sumByPriceGroupByCategory", there are no conditions
+            // First, identify the selector field boundary
+            // The selector ends at: And, Or, GroupBy, OrderBy, ThenBy, Select, Limit, Offset
+            const selectorEndMatch = afterPrefix.match(/(And|Or|GroupBy|OrderBy|ThenBy|Select|Limit|Offset)/);
+            if (!selectorEndMatch) {
+                // No delimiter found, entire suffix is the selector, no conditions
+                return "";
+            }
+            // Check if the first delimiter is And or Or (indicating a condition)
+            if (selectorEndMatch[0] === "And" || selectorEndMatch[0] === "Or") {
+                // Extract everything AFTER the And/Or (skip the And/Or itself for the first condition)
+                const afterAndOr = afterPrefix.substring(selectorEndMatch.index + selectorEndMatch[0].length);
+                // Now apply standard delimiter extraction
+                const delimiterMatch = afterAndOr.match(/(Then[A-Z]|OrderBy|GroupBy|Limit|Offset|Select|ThenBy)/);
+                return delimiterMatch
+                    ? afterAndOr.substring(0, delimiterMatch.index)
+                    : afterAndOr;
+            }
+            // First delimiter is not And/Or, so there are no conditions
+            return "";
+        }
+        // For findBy and pageBy, extract core normally
+        const regex = /(Then[A-Z]|OrderBy|GroupBy|Limit|Offset|Select)/;
+        const match = afterPrefix.match(regex);
+        const corePart = match
+            ? afterPrefix.substring(0, match.index)
+            : afterPrefix;
+        return corePart;
     }
     static getFieldsFromMethodName(methodName) {
-        const core = this.extractCore(methodName);
+        const actionInfo = this.getActionFromMethodName(methodName);
+        const prefix = actionInfo?.prefix || QueryClause.FIND_BY;
+        const core = this.extractCore(methodName, prefix);
+        if (!core)
+            return [];
         const parts = core.split(/OrderBy|GroupBy/)[0] || "";
         const conditions = parts.split(/And|Or/);
-        return conditions.map((token) => {
+        return conditions
+            .filter((token) => token.length > 0)
+            .map((token) => {
             const { operator, field } = this.parseFieldAndOperator(token);
             return field + (operator ?? "");
         });
@@ -162,15 +256,38 @@ export class MethodQueryBuilder extends LoggedClass {
      * @return {string[] | undefined} An array of group by fields or `undefined` if no group by clause exists.
      */
     static extractGroupBy(methodName) {
+        // First check for the standard "GroupBy" clause (e.g., findByActiveGroupByCountry)
         const groupByIndex = methodName.indexOf(QueryClause.GROUP_BY);
-        if (groupByIndex === -1)
-            return undefined;
-        const after = methodName.substring(groupByIndex + QueryClause.GROUP_BY.length);
-        const groupByPart = after.split(QueryClause.ORDER_BY)[0];
-        return groupByPart
-            .split(QueryClause.THEN_BY)
-            .map(lowerFirst)
-            .filter(Boolean);
+        if (groupByIndex !== -1) {
+            const after = methodName.substring(groupByIndex + QueryClause.GROUP_BY.length);
+            const groupByPart = after.split(QueryClause.ORDER_BY)[0];
+            return groupByPart
+                .split(QueryClause.THEN_BY)
+                .map(lowerFirst)
+                .filter(Boolean);
+        }
+        // For "groupBy" prefix (e.g., groupByCategoryThenByRegion),
+        // extract ThenBy fields after the selector
+        const actionInfo = this.getActionFromMethodName(methodName);
+        if (actionInfo?.action === "group") {
+            const afterPrefix = methodName.substring(actionInfo.prefix.length);
+            const thenByIndex = afterPrefix.indexOf(QueryClause.THEN_BY);
+            if (thenByIndex === -1)
+                return undefined;
+            const afterThenBy = afterPrefix.substring(thenByIndex + QueryClause.THEN_BY.length);
+            // Split by ThenBy to get multiple group fields
+            const parts = afterThenBy.split(QueryClause.THEN_BY);
+            // Also stop at OrderBy, Limit, Offset
+            const result = [];
+            for (const part of parts) {
+                const match = part.match(/(OrderBy|Limit|Offset|Select)/);
+                const field = match ? part.substring(0, match.index) : part;
+                if (field)
+                    result.push(lowerFirst(field));
+            }
+            return result.length > 0 ? result : undefined;
+        }
+        return undefined;
     }
     // private static extractOrderBy(
     //   methodName: string
@@ -209,10 +326,15 @@ export class MethodQueryBuilder extends LoggedClass {
      * @return {Condition<any>} A structured condition object representing the query's where clause.
      */
     static buildWhere(core, values) {
-        if (!core && values.length === 0)
+        // Empty core means no where conditions
+        if (!core)
             return undefined;
         const parts = core.split(/OrderBy|GroupBy/)[0] || "";
-        const conditions = parts.split(/And|Or/);
+        if (!parts)
+            return undefined;
+        const conditions = parts.split(/And|Or/).filter((c) => c.length > 0);
+        if (conditions.length === 0)
+            return undefined;
         const operators = core.match(/And|Or/g) || [];
         let where;
         conditions.forEach((token, idx) => {
@@ -232,10 +354,6 @@ export class MethodQueryBuilder extends LoggedClass {
                         ? where.and(condition)
                         : where.or(condition);
         });
-        if (conditions.length === 0)
-            return undefined;
-        if (!where)
-            throw new Error("No conditions found in method name");
         return where;
     }
     /**
@@ -294,14 +412,17 @@ export class MethodQueryBuilder extends LoggedClass {
      * Determines the number of condition arguments, then checks the remaining arguments
      * to resolve sorting, limiting, and pagination.
      *
-     * @param methodName {string} - The extracted core string from the method name.
+     * @param methodName {string} - The method name.
      * @param values {any[]} - The values corresponding to method arguments, including conditions and extras.
+     * @param core {string} - The pre-extracted core string.
      *
      * @return {OrderLimitOffsetExtract} An object containing orderBy, limit, and offset values if present.
      */
-    static extractOrderLimitOffset(methodName, values) {
-        const core = this.extractCore(methodName);
-        const conditionCount = core.split(/And|Or/).length;
+    static extractOrderLimitOffset(methodName, values, core) {
+        const coreString = core ?? this.extractCore(methodName);
+        const conditionCount = coreString
+            ? coreString.split(/And|Or/).filter((s) => s.length > 0).length
+            : 0;
         const extraArgs = values.slice(conditionCount) ?? [];
         let orderBy;
         let limit;

package/lib/esm/query/MethodQueryBuilder.js.map

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

package/lib/esm/query/Statement.js

@@ -91,7 +91,13 @@ export class Statement extends ContextualLoggedClass {
         const forceSimple = ctx.get("forcePrepareSimpleQueries");
         const forceComplex = ctx.get("forcePrepareComplexQueries");
         log.silly(`statement force simple ${forceSimple}, forceComplex: ${forceComplex}`);
-        if ((forceSimple && this.isSimpleQuery()) || forceComplex) {
+        // Simple queries or simple aggregation queries (aggregations without where conditions)
+        // Also exclude multi-level groupBy from simple aggregation squashing
+        const isSimpleAggregation = this.hasAggregation() &&
+            !this.whereCondition &&
+            !this.selectSelector?.length &&
+            (this.groupBySelectors?.length || 0) <= 1;
+        if ((forceSimple && (this.isSimpleQuery() || isSimpleAggregation)) || forceComplex) {
             log.silly(`squashing ${!forceComplex ? "simple" : "complex"} query to prepared statement`);
             await this.prepare(ctx);
             log.silly(`squashed ${!forceComplex ? "simple" : "complex"} query to ${JSON.stringify(this.prepared, null, 2)}`);
@@ -335,6 +341,78 @@ export class Statement extends ContextualLoggedClass {
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     squash(ctx) {
+        // If there's a where condition with complex conditions (nested Conditions), can't squash
+        if (this.whereCondition) {
+            if (this.whereCondition["comparison"] instanceof Condition)
+                return undefined;
+        }
+        // Try to squash simple aggregation queries without where conditions
+        if (!this.whereCondition && !this.selectSelector?.length) {
+            // Count query
+            if (typeof this.countSelector !== "undefined" && !this.countDistinctSelector) {
+                return {
+                    class: this.fromSelector,
+                    method: PreparedStatementKeys.COUNT_OF,
+                    args: this.countSelector !== null ? [this.countSelector] : [],
+                    params: {},
+                };
+            }
+            // Max query
+            if (this.maxSelector) {
+                return {
+                    class: this.fromSelector,
+                    method: PreparedStatementKeys.MAX_OF,
+                    args: [this.maxSelector],
+                    params: {},
+                };
+            }
+            // Min query
+            if (this.minSelector) {
+                return {
+                    class: this.fromSelector,
+                    method: PreparedStatementKeys.MIN_OF,
+                    args: [this.minSelector],
+                    params: {},
+                };
+            }
+            // Avg query
+            if (this.avgSelector) {
+                return {
+                    class: this.fromSelector,
+                    method: PreparedStatementKeys.AVG_OF,
+                    args: [this.avgSelector],
+                    params: {},
+                };
+            }
+            // Sum query
+            if (this.sumSelector) {
+                return {
+                    class: this.fromSelector,
+                    method: PreparedStatementKeys.SUM_OF,
+                    args: [this.sumSelector],
+                    params: {},
+                };
+            }
+            // Distinct query
+            if (this.distinctSelector) {
+                return {
+                    class: this.fromSelector,
+                    method: PreparedStatementKeys.DISTINCT_OF,
+                    args: [this.distinctSelector],
+                    params: {},
+                };
+            }
+            // Group by query (simple single-level grouping)
+            if (this.groupBySelectors?.length === 1) {
+                return {
+                    class: this.fromSelector,
+                    method: PreparedStatementKeys.GROUP_OF,
+                    args: [this.groupBySelectors[0]],
+                    params: {},
+                };
+            }
+        }
+        // Can't squash complex queries with select/groupBy/aggregations that have where conditions
         if (this.selectSelector && this.selectSelector.length)
             return undefined;
         if (this.groupBySelectors && this.groupBySelectors.length)
@@ -353,9 +431,6 @@ export class Statement extends ContextualLoggedClass {
             return undefined;
         let attrFromWhere;
         if (this.whereCondition) {
-            // if (this.orderBySelector) return undefined;
-            if (this.whereCondition["comparison"] instanceof Condition)
-                return undefined;
             attrFromWhere = this.whereCondition["attr1"];
         }
         const order = this.orderBySelectors?.[0]
@@ -401,6 +476,14 @@ export class Statement extends ContextualLoggedClass {
                 return this;
             }
         }
+        // Also try to squash aggregation queries
+        if (ctx.get("forcePrepareSimpleQueries") || ctx.get("forcePrepareComplexQueries")) {
+            const squashed = this.squash(ctx);
+            if (squashed) {
+                this.prepared = squashed;
+                return this;
+            }
+        }
         const args = [];
         const params = {};
         const prepared = {
@@ -408,7 +491,45 @@ export class Statement extends ContextualLoggedClass {
             args,
             params,
         };
-        const method = [QueryClause.FIND_BY];
+        // Determine the method prefix based on the query type
+        let methodPrefix = QueryClause.FIND_BY;
+        let selectorField;
+        if (typeof this.countSelector !== "undefined") {
+            methodPrefix = QueryClause.COUNT_BY;
+            selectorField = this.countSelector !== null ? this.countSelector : undefined;
+        }
+        else if (this.sumSelector) {
+            methodPrefix = QueryClause.SUM_BY;
+            selectorField = this.sumSelector;
+        }
+        else if (this.avgSelector) {
+            methodPrefix = QueryClause.AVG_BY;
+            selectorField = this.avgSelector;
+        }
+        else if (this.minSelector) {
+            methodPrefix = QueryClause.MIN_BY;
+            selectorField = this.minSelector;
+        }
+        else if (this.maxSelector) {
+            methodPrefix = QueryClause.MAX_BY;
+            selectorField = this.maxSelector;
+        }
+        else if (this.distinctSelector) {
+            methodPrefix = QueryClause.DISTINCT_BY;
+            selectorField = this.distinctSelector;
+        }
+        else if (this.groupBySelectors?.length &&
+            !this.selectSelector?.length &&
+            !this.whereCondition) {
+            // Group-only query (no select, no where)
+            methodPrefix = QueryClause.GROUP_BY_PREFIX;
+            selectorField = this.groupBySelectors[0];
+        }
+        // If there's a where condition or selectSelector, use findBy prefix even with groupBy
+        const method = [methodPrefix];
+        if (selectorField) {
+            method.push(selectorField);
+        }
         if (this.whereCondition) {
             const parsed = this.prepareCondition(this.whereCondition, ctx);
             method.push(parsed.method);
@@ -428,11 +549,17 @@ export class Statement extends ContextualLoggedClass {
                 });
             }
         }
-        if (this.groupBySelectors?.length) {
+        // Handle groupBy for non-aggregation queries (already handled for group prefix)
+        if (this.groupBySelectors?.length && methodPrefix !== QueryClause.GROUP_BY_PREFIX) {
             const [primary, ...rest] = this.groupBySelectors;
             method.push(QueryClause.GROUP_BY, primary);
             rest.forEach((attr) => method.push(QueryClause.THEN_BY, attr));
         }
+        else if (this.groupBySelectors?.length && methodPrefix === QueryClause.GROUP_BY_PREFIX) {
+            // For group prefix, add additional group fields as ThenBy
+            const rest = this.groupBySelectors.slice(1);
+            rest.forEach((attr) => method.push(QueryClause.THEN_BY, attr));
+        }
         if (this.limitSelector)
             params.limit = this.limitSelector;
         if (this.offsetSelector) {
@@ -451,7 +578,8 @@ export class Statement extends ContextualLoggedClass {
             this.maxSelector ||
             this.minSelector ||
             this.sumSelector ||
-            this.avgSelector);
+            this.avgSelector ||
+            this.distinctSelector);
     }
     hasAggregation() {
         return (typeof this.countSelector !== "undefined" ||