@decaf-ts/for-couchdb 0.4.30 → 0.4.32

package/lib/esm/indexes/generator.js

@@ -1,4 +1,4 @@
-import { PersistenceKeys } from "@decaf-ts/core";
+import { OrderDirection, PersistenceKeys } from "@decaf-ts/core";
 import { CouchDBKeys } from "./../constants.js";
 import { DefaultSeparator } from "@decaf-ts/db-decorators";
 import { Model } from "@decaf-ts/decorator-validation";
@@ -83,46 +83,76 @@ export function generateIndexes(models) {
     models.forEach((m) => {
         const ind = Model.indexes(m);
         Object.entries(ind).forEach(([key, value]) => {
-            const k = Object.keys(value)[0];
-            // eslint-disable-next-line prefer-const
-            let { directions, compositions } = value[k];
-            const tableName = Model.tableName(m);
-            compositions = compositions || [];
-            function generate(sort) {
-                const name = [
-                    tableName,
-                    key,
-                    ...compositions,
-                    PersistenceKeys.INDEX,
-                ].join(DefaultSeparator);
-                indexes[name] = {
-                    index: {
-                        fields: [CouchDBKeys.TABLE, key, ...compositions].reduce((accum, el) => {
-                            if (sort) {
-                                const res = {};
-                                res[el] = sort;
-                                accum.push(res);
-                            }
-                            else {
-                                accum.push(el);
-                            }
-                            return accum;
-                        }, []),
+            const metadataEntries = [];
+            Object.entries(value || {}).forEach(([, metadataValue]) => {
+                if (!metadataValue)
+                    return;
+                const candidate = metadataValue;
+                if (candidate.directions !== undefined ||
+                    candidate.compositions !== undefined) {
+                    metadataEntries.push([key, candidate]);
+                    return;
+                }
+                if (typeof metadataValue === "object" &&
+                    !Array.isArray(metadataValue)) {
+                    const nested = metadataValue;
+                    Object.entries(nested).forEach(([field, meta]) => {
+                        if (meta)
+                            metadataEntries.push([field, meta]);
+                    });
+                }
+            });
+            metadataEntries.forEach(([fieldKey, meta]) => {
+                if (!meta)
+                    return;
+                // eslint-disable-next-line prefer-const
+                let { directions, compositions } = meta;
+                const tableName = Model.tableName(m);
+                compositions = compositions || [];
+                const fieldKeys = [fieldKey, ...compositions];
+                const tableFilter = {
+                    [CouchDBKeys.TABLE]: {
+                        [CouchDBOperator.EQUAL]: tableName,
                     },
-                    name: name,
-                    ddoc: name,
-                    type: "json",
                 };
-                if (!sort) {
-                    const tableFilter = {};
-                    tableFilter[CouchDBKeys.TABLE] = {};
-                    tableFilter[CouchDBKeys.TABLE][CouchDBOperator.EQUAL] = tableName;
-                    indexes[name].index.partial_filter_selector = tableFilter;
+                function generate(sort, suffix) {
+                    const name = [
+                        tableName,
+                        fieldKey,
+                        ...compositions,
+                        ...(suffix ? [suffix] : []),
+                        PersistenceKeys.INDEX,
+                    ].join(DefaultSeparator);
+                    const baseFields = [CouchDBKeys.TABLE, ...fieldKeys];
+                    const fields = sort
+                        ? [
+                            {
+                                [CouchDBKeys.TABLE]: sort,
+                            },
+                            ...fieldKeys.map((sortField) => ({
+                                [sortField]: sort,
+                            })),
+                        ]
+                        : baseFields;
+                    indexes[name] = {
+                        index: {
+                            fields,
+                        },
+                        name,
+                        ddoc: name,
+                        type: "json",
+                    };
+                    if (!sort) {
+                        indexes[name].index.partial_filter_selector = tableFilter;
+                    }
                 }
-            }
-            generate();
-            if (directions)
-                directions.forEach((d) => generate(d));
+                generate();
+                const normalizedDirections = Array.from(new Set((directions || [OrderDirection.ASC]).map((dir) => String(dir).toLowerCase())));
+                const validDirections = normalizedDirections.filter((dir) => dir === OrderDirection.ASC || dir === OrderDirection.DSC);
+                validDirections.forEach((direction) => {
+                    generate(direction, direction);
+                });
+            });
         });
     });
     generateViewIndexes(models).forEach((index) => {

package/lib/esm/indexes/generator.js.map

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

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

@@ -1,8 +1,7 @@
-import { Condition, Statement } from "@decaf-ts/core";
+import { Adapter, Condition, Statement } from "@decaf-ts/core";
 import { MangoQuery } from "../types";
 import { Model } from "@decaf-ts/decorator-validation";
 import type { Context } from "@decaf-ts/db-decorators";
-import { Adapter } from "@decaf-ts/core";
 /**
  * @description Statement builder for CouchDB Mango queries
  * @summary Provides a fluent interface for building CouchDB Mango queries with type safety
@@ -24,6 +23,8 @@ import { Adapter } from "@decaf-ts/core";
  *   .execute();
  */
 export declare class CouchDBStatement<M extends Model, A extends Adapter<any, any, MangoQuery, any>, R> extends Statement<M, A, R, MangoQuery> {
+    private manualAggregation?;
+    private attributeTypeCache;
     constructor(adapter: A);
     /**
      * @description Builds a CouchDB Mango query from the statement
@@ -134,5 +135,34 @@ export declare class CouchDBStatement<M extends Model, A extends Adapter<any, an
      *
      *   Statement-->>Statement: Return query with selector
      */
+    private buildAggregateInfo;
+    private createAggregateDescriptor;
+    private createAggregateQuery;
+    private shouldUseManualAggregation;
+    private executeAggregate;
+    private handleAverage;
+    private executeManualAggregation;
+    private computeCount;
+    private computeDistinctCount;
+    private computeDistinctValues;
+    private computeSum;
+    private computeAverage;
+    private computeMinMax;
+    private computeGroupBy;
+    private groupSelectResults;
+    private collectValues;
+    private convertValueByAttribute;
+    private getAttributeType;
+    private normalizeMetaType;
+    private normalizeComparable;
+    private groupKey;
+    private toNumericValue;
+    private convertAggregateValue;
+    private resolveSelectorAttribute;
+    private missingDecorator;
+    private decoratorForKind;
+    private processViewResponse;
+    private isViewAggregate;
+    private getCouchAdapter;
     protected parseCondition(condition: Condition<M>): MangoQuery;
 }