@livequery/mongoose 2.0.21 → 2.0.22

package/build/src/MongoQuery.js

@@ -94,47 +94,67 @@ export class MongoQuery {
     static #parse_summary(req) {
         const mappers = Object
             .entries(req.options)
-            .map(([k, v]) => {
+            .map(([k, v], index) => {
             if (!k.startsWith('::'))
                 return [];
-            const [a, ...groups] = `${v}`.split('|');
-            const [expr, infix] = a.split(')')[0].split('(');
-            if (!['sum', 'avg', 'max', 'min', 'count'].includes(expr))
-                return [];
-            const query = this.#postfix_to_mongodb(this.#infix_to_postfix(infix));
-            const group_by = groups.length == 0 ? 'NO_GROUP' : groups.join('|');
+            const exprs = `${v}`.split('|').filter(Boolean);
+            const fns = exprs.map(l => {
+                const exp = l.split('(')[0];
+                if (!['sum', 'avg', 'max', 'min', 'count'].includes(exp))
+                    return [];
+                const infix = l.split('(')?.[1]?.split(')')?.[0];
+                if (!infix)
+                    return [];
+                if (exp == 'count')
+                    return [{ exp, infix, query: { $sum: 1 } }];
+                const query = this.#postfix_to_mongodb(this.#infix_to_postfix(infix));
+                return [{ exp, infix, query: { [`$${exp}`]: query } }];
+            }).flat(2);
+            const groups = exprs.filter(g => g.match(/^[a-zA-Z_]+$/));
+            const $match = exprs.map(exp => {
+                for (const { c, f } of [
+                    { c: '==', f: 'eq' },
+                    { c: '<>', f: 'ne' },
+                    { c: '>=', f: 'gte' },
+                    { c: '<=', f: 'lte' },
+                    { c: '>', f: 'gt' },
+                    { c: '<', f: 'lt' },
+                    { c: '=', f: 'eq' },
+                ]) {
+                    if (exp.includes(c)) {
+                        const [a, b] = exp.split(c);
+                        return { [a]: { [f]: isNaN(Number(b)) ? (c == '==' ? (b == 'true') : b) : Number(b) } };
+                    }
+                }
+            }).filter(Boolean);
             return [{
-                    id: Buffer.from(k, 'utf-8').toString('hex'),
-                    group_id: Buffer.from(group_by, 'utf-8').toString('hex'),
-                    name: k.split('::')[1] || '#',
-                    expr: expr.toLowerCase(),
-                    query,
+                    id: k.split('::')[1] || `summary_${index}`,
+                    fns,
                     groups,
-                    group_by
+                    $match
                 }];
-        })
-            .flat(2);
-        const expresisons = mappers.reduce((p, { expr, query, groups, group_id, id }) => {
-            p.set(group_id, {
-                ...p.has(group_id) ? p.get(group_id) : {
-                    _id: groups.length == 0 ? null : groups.reduce((p, by) => {
-                        return {
-                            ...p,
-                            [by]: `$${by}`
-                        };
-                    }, {}),
-                },
-                ...expr == 'count' ? { [id]: { $sum: 1 } } : {},
-                ...expr == 'max' ? { [id]: { $max: query } } : {},
-                ...expr == 'min' ? { [id]: { $min: query } } : {},
-                ...expr == 'sum' ? { [id]: { $sum: query } } : {}
+        }).flat(1);
+        const expresisons = mappers.reduce((p, { fns, groups, id, $match }) => {
+            p.set(id, {
+                $match,
+                _id: groups.length == 0 ? null : groups.reduce((p, by) => {
+                    return {
+                        ...p,
+                        [by]: `$${by}`
+                    };
+                }, {}),
+                ...fns.reduce((p, { infix, exp, query }) => ({
+                    ...p,
+                    [`${exp}_${infix}`]: query
+                }), {})
             });
             return p;
         }, new Map);
-        const pipelines = [...expresisons].reduce((p, [group_by, $group]) => {
+        const pipelines = [...expresisons].reduce((p, [group_by, { $match, ...$group }]) => {
             return {
                 ...p,
                 [group_by]: [
+                    ...$match.length > 0 ? [{ $match }] : [],
                     { $group },
                     {
                         $project: {
@@ -294,7 +314,7 @@ export class MongoQuery {
         ];
     }
     static #build_cursor_paging($sort, req) {
-        const { pipelines, summary, mappers } = this.#parse_summary(req);
+        const { pipelines, mappers } = this.#parse_summary(req);
         const limit = this.#get_limit(req);
         return [
             {
@@ -306,7 +326,12 @@ export class MongoQuery {
             },
             {
                 $project: {
-                    ...summary,
+                    summary: mappers.length == 0 ? 1 : mappers.reduce((p, c) => {
+                        return {
+                            ...p,
+                            [c.id]: c.groups.length == 0 ? { $arrayElemAt: [`$${c.id}.value`, 0] } : `$${c.id}`
+                        };
+                    }, {}),
                     prev: {
                         $ifNull: [
                             { $arrayElemAt: ["$prev", 0] },
@@ -323,12 +348,7 @@ export class MongoQuery {
             },
             {
                 $project: {
-                    summary: mappers.length == 0 ? 1 : mappers.reduce((p, c) => {
-                        return {
-                            ...p,
-                            [c.name]: { $arrayElemAt: [`$summary.${c.group_id}.${c.id}`, 0] }
-                        };
-                    }, {}),
+                    summary: 1,
                     items: {
                         $concatArrays: ["$prev.items", "$next.items"]
                     },

package/package.json

@@ -6,7 +6,7 @@
     "repository": {
         "url": "git@github.com:livequery/mongoose.git"
     },
-    "version": "2.0.21",
+    "version": "2.0.22",
     "description": "Mongoose datasource mapping for @livequery ecosystem",
     "main": "./build/src/index.js",
     "types": "./build/src/index.d.ts",